From b9017e53a240e8b89b9d0a643f49d6521a4a3283 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Mon, 23 Nov 1998 04:32:04 +0000 Subject: [PATCH] removed assertements for constructed containers again, since this Mon Nov 23 05:21:50 1998 Tim Janik * gtk/gtkcontainer.c: (gtk_container_add_with_args): (gtk_container_addv): (gtk_container_add): removed assertements for constructed containers again, since this essentially breaks the "child" arg. * gtk/gtktooltips.c (gtk_tooltips_force_window): fixup the draw_window reference count, we don't need to reference toplevels that already have destroy notifiers. * gtk/gtkscrolledwindow.c: check for the composites existance in _forall since we might not be already constructed. --- ChangeLog | 15 +++++++++++++++ ChangeLog.pre-2-0 | 15 +++++++++++++++ ChangeLog.pre-2-10 | 15 +++++++++++++++ ChangeLog.pre-2-2 | 15 +++++++++++++++ ChangeLog.pre-2-4 | 15 +++++++++++++++ ChangeLog.pre-2-6 | 15 +++++++++++++++ ChangeLog.pre-2-8 | 15 +++++++++++++++ gtk/gtkcontainer.c | 3 --- gtk/gtkscrolledwindow.c | 6 ++++-- gtk/gtktooltips.c | 1 - 10 files changed, 109 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e0001b44b..efc272e536 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Mon Nov 23 05:21:50 1998 Tim Janik + + * gtk/gtkcontainer.c: + (gtk_container_add_with_args): + (gtk_container_addv): + (gtk_container_add): removed assertements for constructed containers + again, since this essentially breaks the "child" arg. + + * gtk/gtktooltips.c (gtk_tooltips_force_window): fixup the draw_window + reference count, we don't need to reference toplevels that already have + destroy notifiers. + + * gtk/gtkscrolledwindow.c: check for the composites existance in + _forall since we might not be already constructed. + Sun Nov 22 14:34:58 CST 1998 Shawn T. Amundson * Released GTK+ 1.1.5 diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 7e0001b44b..efc272e536 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,18 @@ +Mon Nov 23 05:21:50 1998 Tim Janik + + * gtk/gtkcontainer.c: + (gtk_container_add_with_args): + (gtk_container_addv): + (gtk_container_add): removed assertements for constructed containers + again, since this essentially breaks the "child" arg. + + * gtk/gtktooltips.c (gtk_tooltips_force_window): fixup the draw_window + reference count, we don't need to reference toplevels that already have + destroy notifiers. + + * gtk/gtkscrolledwindow.c: check for the composites existance in + _forall since we might not be already constructed. + Sun Nov 22 14:34:58 CST 1998 Shawn T. Amundson * Released GTK+ 1.1.5 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7e0001b44b..efc272e536 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,18 @@ +Mon Nov 23 05:21:50 1998 Tim Janik + + * gtk/gtkcontainer.c: + (gtk_container_add_with_args): + (gtk_container_addv): + (gtk_container_add): removed assertements for constructed containers + again, since this essentially breaks the "child" arg. + + * gtk/gtktooltips.c (gtk_tooltips_force_window): fixup the draw_window + reference count, we don't need to reference toplevels that already have + destroy notifiers. + + * gtk/gtkscrolledwindow.c: check for the composites existance in + _forall since we might not be already constructed. + Sun Nov 22 14:34:58 CST 1998 Shawn T. Amundson * Released GTK+ 1.1.5 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7e0001b44b..efc272e536 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,18 @@ +Mon Nov 23 05:21:50 1998 Tim Janik + + * gtk/gtkcontainer.c: + (gtk_container_add_with_args): + (gtk_container_addv): + (gtk_container_add): removed assertements for constructed containers + again, since this essentially breaks the "child" arg. + + * gtk/gtktooltips.c (gtk_tooltips_force_window): fixup the draw_window + reference count, we don't need to reference toplevels that already have + destroy notifiers. + + * gtk/gtkscrolledwindow.c: check for the composites existance in + _forall since we might not be already constructed. + Sun Nov 22 14:34:58 CST 1998 Shawn T. Amundson * Released GTK+ 1.1.5 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7e0001b44b..efc272e536 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,18 @@ +Mon Nov 23 05:21:50 1998 Tim Janik + + * gtk/gtkcontainer.c: + (gtk_container_add_with_args): + (gtk_container_addv): + (gtk_container_add): removed assertements for constructed containers + again, since this essentially breaks the "child" arg. + + * gtk/gtktooltips.c (gtk_tooltips_force_window): fixup the draw_window + reference count, we don't need to reference toplevels that already have + destroy notifiers. + + * gtk/gtkscrolledwindow.c: check for the composites existance in + _forall since we might not be already constructed. + Sun Nov 22 14:34:58 CST 1998 Shawn T. Amundson * Released GTK+ 1.1.5 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7e0001b44b..efc272e536 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,18 @@ +Mon Nov 23 05:21:50 1998 Tim Janik + + * gtk/gtkcontainer.c: + (gtk_container_add_with_args): + (gtk_container_addv): + (gtk_container_add): removed assertements for constructed containers + again, since this essentially breaks the "child" arg. + + * gtk/gtktooltips.c (gtk_tooltips_force_window): fixup the draw_window + reference count, we don't need to reference toplevels that already have + destroy notifiers. + + * gtk/gtkscrolledwindow.c: check for the composites existance in + _forall since we might not be already constructed. + Sun Nov 22 14:34:58 CST 1998 Shawn T. Amundson * Released GTK+ 1.1.5 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7e0001b44b..efc272e536 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,18 @@ +Mon Nov 23 05:21:50 1998 Tim Janik + + * gtk/gtkcontainer.c: + (gtk_container_add_with_args): + (gtk_container_addv): + (gtk_container_add): removed assertements for constructed containers + again, since this essentially breaks the "child" arg. + + * gtk/gtktooltips.c (gtk_tooltips_force_window): fixup the draw_window + reference count, we don't need to reference toplevels that already have + destroy notifiers. + + * gtk/gtkscrolledwindow.c: check for the composites existance in + _forall since we might not be already constructed. + Sun Nov 22 14:34:58 CST 1998 Shawn T. Amundson * Released GTK+ 1.1.5 diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index 881471ca7d..c78c160a6b 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -248,7 +248,6 @@ gtk_container_add_with_args (GtkContainer *container, g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (widget->parent == NULL); - g_return_if_fail (GTK_OBJECT_CONSTRUCTED (container) == TRUE); gtk_widget_ref (GTK_WIDGET (container)); gtk_widget_ref (widget); @@ -307,7 +306,6 @@ gtk_container_addv (GtkContainer *container, g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (widget->parent == NULL); - g_return_if_fail (GTK_OBJECT_CONSTRUCTED (container) == TRUE); gtk_widget_ref (GTK_WIDGET (container)); gtk_widget_ref (widget); @@ -692,7 +690,6 @@ gtk_container_add (GtkContainer *container, g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (widget->parent == NULL); - g_return_if_fail (GTK_OBJECT_CONSTRUCTED (container) == TRUE); gtk_signal_emit (GTK_OBJECT (container), container_signals[ADD], widget); } diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index d68960b924..944026fc2b 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -547,8 +547,10 @@ gtk_scrolled_window_forall (GtkContainer *container, callback (scrolled_window->child, callback_data); if (include_internals) { - callback (scrolled_window->vscrollbar, callback_data); - callback (scrolled_window->hscrollbar, callback_data); + if (scrolled_window->vscrollbar) + callback (scrolled_window->vscrollbar, callback_data); + if (scrolled_window->hscrollbar) + callback (scrolled_window->hscrollbar, callback_data); } } diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c index 74cdcbc92b..123c37c857 100644 --- a/gtk/gtktooltips.c +++ b/gtk/gtktooltips.c @@ -175,7 +175,6 @@ gtk_tooltips_force_window (GtkTooltips *tooltips) if (!tooltips->tip_window) { tooltips->tip_window = gtk_draw_window_new (GTK_WINDOW_POPUP); - gtk_widget_ref (tooltips->tip_window); gtk_window_set_policy (GTK_WINDOW (tooltips->tip_window), FALSE, FALSE, TRUE); gtk_signal_connect_object (GTK_OBJECT (tooltips->tip_window), -- 2.30.2